2c9a8ccad9e3fa5ebe3ae4c25520e8bf1119770b,http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/ContextHandler.java,ContextHandler,getServletContext,#Bundle#,144

Before Change


            {
                holder = new ContextHolder();
                // TODO check for null
                holder.servletContextHelper = bundle.getBundleContext().getServiceObjects(this.info.getServiceReference()).getService();
                holder.servletContext = new PerBundleServletContextImpl(bundle,
                        this.sharedContext,
                        holder.servletContextHelper);

After Change


            ContextHolder holder = this.contextMap.get(key);
            if ( holder == null )
            {
                final ServiceObjects<ServletContextHelper> so = bundle.getBundleContext().getServiceObjects(this.info.getServiceReference());
                if ( so != null )
                {
                    holder = new ContextHolder();
                    // TODO check for null
                    holder.servletContextHelper = so.getService();
                    holder.servletContext = new PerBundleServletContextImpl(bundle,
                            this.sharedContext,
                            holder.servletContextHelper);